Fix for VOV-1368 VOV-1411