fixed so we can live with or without context root