Crude hack to kind of support all the other stuff