Fixes the issue that it wouldn't properly pass the expiration time
Merge pull request #449 from terwey/CS-4867

Fixes the issue that it wouldn't properly pass the expiration time