Crucial bug fixed