Fixed bug in org ctx