Commit issue #56