Thanks for taking care of this, with the helper function is not needed anymore \o/