Tiny logic improvement