Fixed serverside handling

Fixes #4