Follow-up on changes related to issue 3195