[DEV] Fix system position