Fix LIBOMV-967, patch by TB