still trying to fix issue