Fixed issue #21