Restored original if statement