This addresses issue #1255.