This addresses the problem in screenshot 2