bug fix plus introduced shockscale