Fix for IDs in org 8