Bugfix: Don't unpack kwargs