Delivery Bug Fixe: Phase 1