re-commit; fix issue #53;