Small options framework fix