commit issue #24