Crafty 0.5.4 fix