Fix for #69