Fix for #75