Corrected the fix to bug #41