this should really be the final router bug fix