fixes #1, dependency on server