GB: bug fix on form