Actually made the previous commit work.