fix moar bugz