Rename fixes #1 to fixes #6