Fixing Alex's mistakes