Empty wells handling added