fixed small bug before re-factor