fix for #573