Fix for #384 - titles on options