Fixed 0.3 timestamp issue