Correction on handling available options