added by #489