Attempt to fix issue #25.