commit Patch from Vedant Agarwala, Fixes Bug #1173781