fix #4033 again (and #4026 by extension)