bugfix
Better track generation