Fixed 0020 after upstream commit