Time paradox #229
Merge pull request #233 from folex/issue_229

Time paradox #229 fixed