Revert "set_fix"

This reverts commit 867c4f69101654c2617ff9eed0593b411e192515.