Fixed any chance of shakey entities