Heri | 1803: Fixing build