fixed the bug in prod branch