Fixed missed logic