Fixed: A TERRIBLE BUG