Fixed them both