Fix for #58.