reverting fix to older version that actually works