OnSurrondFieldset fix