Fixed the thing (part 2)