fixing issues with including multiple times