Fix initializarion and position reset