support for #489