fix for #553