fix get-unit to return one unit