bug fixes with underscore