Merge pull request #649 from manuelluis/mlsr/flush-fix_time