Fixed issue where internal id wasn't referenced - Issue #38