Fix for options not on first level property