Fix issue #35