bug fix & rough sign support