Fixed the relations issue