org nightmare but fixed