fixed double inclusion problem