Fix for "underscore" support