Fix artifacts

My last change had some artificats that I noticed too late. Fixed now.

Change-Id: Ic8185bc96b713b24872b5597145768215a89f8b4
Merge "Fix artifacts"