Trying to fix an issue