Remove if statement to remove error