Fixed issue AMS-1094