Fixes paintings. Again.

Created by: Intigracy

fix #9328 (closed)

Exact same changes as I made in #8909 except to the other half of the file.