Attempt to fix issue