diff --git a/python-env/defaults/main.yml b/python-env/defaults/main.yml
index ffafef78..ffcce4a6 100644
--- a/python-env/defaults/main.yml
+++ b/python-env/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 py_env_install: False
-py_env_pkgs_state: installed
+py_env_pkgs_state: present
 py_env_site: False
 py_env_trusty_workaround: True
 py_env_get_pip_url: https://bootstrap.pypa.io/get-pip.py
diff --git a/python-env/tasks/main.yml b/python-env/tasks/main.yml
index 074cad3f..ad667cb8 100644
--- a/python-env/tasks/main.yml
+++ b/python-env/tasks/main.yml
@@ -25,14 +25,15 @@
 
     - name: Fix the trusty pip installation
       shell: /usr/local/bin/python-pip-fixer
-      when: ( python_pip_fixer | changed )
+      when: python_pip_fixer is changed
 
     - name: Install the python dev headers and other dev requirements
       apt: pkg={{ item }} state=present
       with_items: '{{ py_env_pip_dev_packages }}'
 
     - name: Install the latest six python package
-      pip: name=six state=latest
+      #pip: name=six state=latest
+      pip: name=six state=present
 
     - name: Install setuptools version 33.1.1
       pip: name=setuptools version=33.1.1 state=present