fixing other places