bugfix for hotbuild2