attempt to fix 7174. includes debug prints
cleanup