small improvement
ugly partial fix for bug