fixed issues with custom tracks
Bug fixes