fixed once of bugs