Adressed PR's comment