Still trying to fix the issue