significant bug fix