Add workaround to fix whitespace-cleanup