fix & sync with svn