Fix: ugly hack.
Fix: timestamp was missing.