Fixed issues with having id's of 0