Bug fix plox?