PreHPCC bugfix. Cont. LakeOrder development