Bug fix: include/exclude not being respected