o: fixed regression after merging