Unit loading fixed