Little hack with kwargs added