This condition could be removed now