* Server-side fix of #119, part 1