hack to work with new stuff