follow up to #287