FIXED: null pointer issue