Fix choice of module when both possible
Fix decoding with jiffy