Fix for #227