Fix paths
More readable loop