Fix singleton variable warning in the YAP adapter file