temporary workaround for org 8.0