timestamp check fix + bugfix