Fix seperate client/server behaviour