Try to fix Richmond case