Changes to support #649