fix / workaround for #244