Fixed #86

This fixes the issue for me
why shuffle?