bug fix related to multiple surface forms with the same name