Removed if statement that always returned true