working issue #77