Plugin logic correction