Better fix when using migrations