Bug fix for Shuffler