Another try that finally fixes pending problems