Another try to fix issues