Fix for #244