Fix instance initialization