[OLINGO-340] Fix
[OLINGO-341] Fix