I think we can remove the "target" hack now?