Test commit fixes#23