Changes related to #462