Fixed issue #16