Bugfight bugs

NEXT