Removed a potential bug