#39 extend options automatically