Fix get_initial to take current value into account. Thanks @d0ugal