Fixed options map corruption
Merge pull request #123 from 28msec/fix-options-map

Fixed options map corruption