Fixed bug with number second part