add support suffix and fix bug about suffix