fixed one of the two issues