I'm sure I had fixed this in the last commit, but obviopusly it wasn't so another attempt to get the unit's contents straight...

Author: MHumm