Handle options.data correctly
0.6.2