Fixed issue #35