Tab fix didn't work, revert to old behavior