Bug fix, and rename