Fix for #330.
0.6.2