Fixed issue #31