Fixed gii after merge #1184