Fix for #95.