correctly handle options
correctly handle options
correctly handle options