fix: proper handling of pre-fill values