fixing IUGATEWAY-247, IUGATEWAY-248