Bug fix in init