added baseurl fix (faithful-witness)