I think the two lines above should also be in this **if**, shouldn't they?