Fixed survey wrapping issue