Fix previous fix (the cause was actually a misplaced #endif, or so it seems)