Partially fixes issue #59. Server side fix not done yet.