Fixed a small issue with organization attribute