Working on #119: Including and excluding on the same files doesn't work as expected