This *should* fix the server bug