Fixed issue #13