Fixed issue #16.