Fix artifacts (part 2)