Corrected behaviour for skip-original. Fix #60