Fix six.moves