Bug fix, ID resolved