JAX-WS solution bugs fixed