[Sprint 19] fixed js