Fixing RESTWS-284 ticket according to previous pull request's(#31) comments