Fix for #74