fied a small bug
merged