fixed org bug