Issue #85, fixed a small bug