Removed a final bug