Small improvement in the frontend