Fix w/ and w/o