Fix polish Closes #2169.