Fix crucial bug