Fix for six.moves bug. See #35