Fixed a change in org 8.0