#84 server side fix