Fixed options completion