Fix bug for extra options