fixed issue 2602
Merge branch 'iss2602'
issue 2602 fixed