Actual fix for Issue #40

Made a mistake in last commit; it did not fix the problem. Issue is
properly fixed now.