[ issue 1203 ] fixed
Merge branch 'Issue1203'