Fix bug, increase coverage.