Fixed @option keys