opps that merg fix didn't work. adding back my hack