fix timestamps and prevent variable shadowing inside constructor