#1163 and #1164 - manual editing of unsupported coumns