Follow-up of #615
Follow-up of #615