#7 Fix for unexpected partial matches of particle