-BUGFIX: correct until timestamp calculation