fix #59 to use server side information