Bug fix: No more particle pop-in