Implemented final fix for AFM-94.