Static instance fix