Bug fix for options