Fix for #248