Ensure we define the class property before using it

Ensure we define the class property before using it #1017