Fix yucky code