Added check to catch #1871