Fix for #82