BAAWrapper fix - also LFCR issue