Fix for SET after the recent changes