Further fixing the Symbol vs Integer issue