Fix bug
Merge branch 'TestServer' of github.com:andreyu/Reports into TestServer
Fix bug