Fixed change from passing pointer to scalar