Fixed issue with shuffle btn