Fixed the issue 1357
Fixed the issue 1359
Fixed the issue 1359
Fixed the issue 1359