Fix wrong timemark handling