Fixed wrong time issue #31