Attempting to fix issue #7 again.