Fixing up Option code