Try to fix issues