fixed import path and a small bug