Minor tweak with final set properties