fixing PORTAL-897