bug fix:MTC-1136