Fixes problem with only/except functionality. Fixes #8