[PD] Another Gem performance issue