Fix for malformed ID