Hotfix - fix incompatible parsing order for old samples. Fixes #192.