Fixed it so messages are only sent to the correct target component