Issue 1271 fix.