Fixed PR and swing