WP-1424: Uptade -- FIXED.