add mark and fix bug