Attempt at fixing bug #289