Reverted one logic flaw