[OLINGO-506] Better fix