Fixes  #5631: Migrate directive withou change in form work again