bug fix for bug #125