Try to fix the missing default instance bug