Fix logic and no move error