Trying to fix nasty bug - crash during building.