Fix remitto bug for 1.7.2