CLOUD-105 if statement corrected