Use jetty to fix bug perhaps?