Import bug fixed