Will take care of this with #170