Clip regression

Fixed visual regressions introduced in #2940.