Removed the problematic code