Possibly fix issue