Fixed shared concern

[b38b0f04e851ae4296c2d28ab490ec0fcc937ab1]