Included missing changes

Changes made in 71a1666#diff-d41d8cd98f00b204e9800998ecf8427e were missed in the last pull request.