Added in a hack for Tantum