LERGO-347 - fixing implementation