Fix for 22tracks

Resolves #456