working issue #60