q/a code fix