bug in 9384 fixed
finally! bug fix, squash