follow-up to 0701b05a00c380fb6e7e115baa19fb8ae94e45a9 (ref #48)