Nice, both changes applied here e8597cead67bb1f94835d991eccbcdec7d5a1640