Fixed dot vs. underscore issue