fixed: pointer issues
fixed: pointer issue