WIKI-393 Fix code as reviewer comment