Fix for #78