#782 - fix time usage
#782 - clean up incorrect time handling"