attempt to fix issues