Underscore fix
Underscore fix #2
Revert "Underscore fix #2"

This reverts commit 090f8a46a23eb25b5c31e04bc48d3bd082aa0ec2.