removed felixes patch