Better handling.