Fix artifacts (part 1)