Addressed in bcf12fc