Fix command option access