Alternative: fix them properly :P