Another attempt to fix bug #530