Pseudoconstant defaults not populated when editing CiviCRM Profile in Drupal's user account section

Although it's being displayed properly, when u edit, dropdowns with countries based on Custom Fields do not have defaults chosen.

For reference, suspicious part of the code:

CRM/UF/Form/Dynamic.php:

function &setDefaultValues()
{
$defaults = array();

if ( $this->_contact ) {
foreach ( $this->_fields as $name => $field ) {
$objName = $field['name'];
if ( $objName == 'state_province_id' ) {
$states =& CRM_Core_PseudoConstant::stateProvince( );
if ( $this->_contact->state )

{ $defaults[$name] = array_search( $this->_contact->state, $states ); }

} else if ( $objName == 'country_id' ) {
$country =& CRM_Core_PseudoConstant::country( );
if ( $this->_contact->country )

{ $defaults[$name] = array_search( $this->_contact->country, $country ); }

[...]

Will try to fix it tomorrow.