Small temporary fix on Tower until Jonte is done