Fixed bugfix and added time verification.