Fix compile error

This caused a ‘extra qualification’ error.
Merge branch 'develop' into Optimizations