Fixed issue #17