hopefully fully fixed now