still trying to fix this issue