Fixed underscore issues. Fixes #25