Fixes static, timestamp bug