fixing all delivery entry case