Fix Jarvis issues

Where from does `timestamp` come?