Proper shuffle problem resolved