Fix for #66