FEAT-123 Fixing compile failure