Fixed bug TC-2265