Fix for org creation