*sigh* deal with instances correctly
2 files changed