ADEN-1082 No extra shuffle