bug fix?2