Fixed survey ability (again)