Bug fix + formatting rsfa and rsfb tables