Fix for #86