better implementation of support for edge cases found in TCon