Small fix related to AM-58