Fixed a missing hunk from this commit aeb5ec07