fixing behaviors