Fixed yucky code