Build fix by jonnyli1125 (manually merge)