[#4635] Fixing after review