Fix after migration