Fixes #3773

Fixed some minor issues with suggested fix.