Touch-up on new import routine. See: websharks/s2member#149