remove if statement which is most likley problematic