Another hack to work with Dan's stuff