Fix for id problem