fixed some issue with import