fixed  bug
merged