Fix 1101937

@childsb
Sure. would do the required changes and push it again.