Better fix for the pluck issue