Further fix for init