commit fixes on #25