Fix from first init