still trying to fix the issue