Fix OTBM save