Fixed delivery view issue