Fixed issue AMS-1098