Fixed issue #16;