Issue #42. Cleanup code of the fix.