TARDIS 13-Borders fixed