Fix for #90.