adds code to fix #1973 for more flexibility with push/pull classes for single increments