Bugfix attempt 2 on Take survey bug