Fix option listing