Double include fix