Fixed wrong field assignment