Commit fixes #24