Another try to fix it