try to fix issues