this fixes one issue, not the other one
Merge branch 'refactor-msm' of github.com:rmcgibbo/mixtape into refactor-msm