Another try to fix the issue