buildmaster fix for issue #4 same as before