Fix for #88