Issue 4832: Fix bug wrong unit position