Coral patch.

Follow up of request #306.