Merge bpat Error 500 fixe