Fix unless logic