new attempt at fixing bug #97