Follow up to 4240807