CDITCK-371 One more fix