Fixing Chorin