Fixed issue #3 again.