fixed bad definitions