Fix state
Merge branch 'bitbucket-master'

* bitbucket-master:
  Fix state