fix build via lazy init
Merge pull request #1134 from jay-hodgson/release-55

fix build via lazy init