Removed an IF condition to improve performance