Make initialization safer