Fixed defect AMS-1053