Fixed some logical thing