huge bug fix