Fix singleton variable warning in previous commit