bug fixing.
merged