Bug fix for single instance stuff.