A bit of neat fixery