Fix to export timer