P-100178 & #689 case

P-100178 & #689 case