Proposed fix for 929 AFP wave display

Proposed fix for #929 AFP wave display