fix ziliang
fix marshal about delayed trick found by @@adamhj