Bugfixing deluxe.