Fixed issue #262