last commit fixes #7