Possibly fixed getTimestamp issue