Fixed accept handling