@chikathreesix fixed an issue where data-setup options could be missed. closes #1514