#589 - Fix SandBox field ordering