migrate fix, clip modal fix