Commit fixes #7