Fix for #229