Fix hyphen instead of underscore as well.