Yoselyn.survey

This is the same fix for survey in other branch