Test commit fixes #1