EST-277 - quick fix