Fixed -o/-b handling