Issue introduced via #1031
Issue introduced via #1031