Server fix. Closes #9