An ugly workaround to get it work with TB v3, but some heavy work is still needed!