Fix for BuildMaster 4.2