Minor replacement (#17)