Also the new dummy system coming in the next big patch might actually help with this issue as well.