added previous field check