Refs #2384 (nice fix - a workaround a bug #2387)