Added missing #endif

Looks like the last merge broke the build.
Merge branch 'fix-build'