Nasty hack to avoid broken tips