fixed the issue03