1.6 compat with migrations