hotfix -- sample compatability