Properly handle sets