Bug fix & add skipnum