refactor forceFillColumn and fix bug