Still don't want to push that to shared in order to not to break all the tests :)