fix clobbered code
Merge branch 'fix'