Fix and test added.