Fix and close issue #30