Fixed some bug for file import