Fixed kwargs issue