Bug fix + Issue when AMS is down