Temporary fix for pointer issue