Eliminated a performance bug