Another attempt at fixing bug #130