Fix issue #123 (@Nodesys)