'Fix issues AS-2'