FIX: Removing unnecessary check