Working after [OLINGO-262]