fix mkdate and order of import