Fixed build-breaking member variable reordering