Sandbox controller fix