Modified core to not lose values anymore