Fix server-time support
Merge pull request #402 from foldericon/patch-1

Fix server-time support