fix annoyning misbehavior