VID-1833 Protect your public methods