A bug fix and an improvement.