trying to fix issues