Last particle issue fixed