add in hack to deal with special cases