Take a stab at #1341