another server-side fix (#12)