FIXED #15. Corrected options data structure.