Fixing the set functions