Applying https://github.com/codeparty/tracks/pull/11
Apply https://github.com/codeparty/tracks/pull/15