major quick bug fix