Attempt to fix bug #672