diff --git a/python-nibabel.spec b/python-nibabel.spec
index ab714ed..b55116a 100644
--- a/python-nibabel.spec
+++ b/python-nibabel.spec
@@ -96,7 +96,7 @@ Python 3 version.
 %autosetup -n %{modname}-%{version} -S git
 rm -vrf %{modname}/externals/
 # Hard fix for bundled libs
-for f in $(find -path ./doc -prune -o -type f -name '*.py') bin/*; do
+for f in $(find -type f -path ./doc -prune -o -name '*.py') bin/*; do
   sed -i \
     -e "s/from nibabel.externals.six/from six/"                                           \
     -e "s/from \.*[ ]*externals.six/from six/"                                            \
@@ -104,7 +104,7 @@ for f in $(find -path ./doc -prune -o -type f -name '*.py') bin/*; do
     -e "s/from nibabel.externals import OrderedDict/from collections import OrderedDict/" \
     -e "s/from \.*externals import OrderedDict/from collections import OrderedDict/"      \
   $f
-  grep "externals" $f && exit 1
+  grep "externals" $f | grep "import" && exit 1
 done
 sed -i -e "/externals/d" setup.py