fixed: _ and $