Fix Swindler Bug