Fixed issues with ids