Re-added mistakenly deleted condition...