Alpha 17: fix small bug adding kwargs to inputs