Fix bug for kwargs