fixing IUGATEWAY-245