Fixed pointer issue