fixed the issue properly