Fixed initialization