bug fix from last update