Crucial bug fix