Crucial bug fix!