CHANGE: restore the previous funtionality, fixing the signature only.