added by #749