Coding mistake in initial fix for Issue #25. Corrected here