Fixed options issue