fixed bug #3793 and #3792 (#3794)
fixed bug #3793 and #3792 (#3794)

Co-authored-by: jasham.qureshi <ec6b9469a6bfa2d826188d6e45bada1ca2912857@covalensedigital.com>
styled-components/styled-components,styled-components/styled-components,styled-components/styled-components