The previous version as not correct. After some testing, this one appears to valid.