Fixed initialization and start