Dimension Fix

Per previous conversation with @dmlap @gkatsev about re-implementing dimension fix via separate PR.