Fix bug with underscore at begining