commit fixes #1482