Fixed If Statement Issue