fetch actual type from Set as well
Merge pull request #124 from hsn10/working-set

Fix for #122