@cyriltovena is this something we need to fix on the backend side, or is there something we can do in the frontend to prevent this?