Fix atmail_controller