Fixed issue #23