LPS-45854 Missing references bug fix