Fixed Issues with Shocks