#38 Now ignores subtracks