I am fixing issue #62