Fixing time start/end