Use correct set functions