WL-2463 Fix for ending up with wrong unit details.

A belt and braces approach to fixing this.