Fix for streetcar.