Fix for #193