fix dynamic bugs