Fixed issue #7 again