Adjustment of time mapping; Bug fix.