Fixed options bug