follow-up to #898
follow-up to #898