Fixed issue #2;