Fix robeaux support