hotfix for options issues