Fix build for previous sdk versions