Fix #19 again, caused by tuple