Trying to fix issues