Seem to fix bug #244 indefinitely.

Seem to fix bug #244 indefinitely.