bug fix from last submit