Issue#323 afp