VID-2079 fixing optional param