follow-up to #604