Fixed error introduced during implementation of options and data dicts