Fix for particle systems