#2154

Fix for move column issues #2154 and #2156