AMS - LPS-45066 AMS still needs fixing