fix MOAR bugz