quick fix for migration, need to redo after migration