Adding code that was missed in prev commit. (63c797439b04fd09d55d7fc410233ec8e82a1270)