I have mantained current behavior in order to not break anything