Fix for pre-existing values not getting prepped