Fix issue with MVC segfault

- Many thanks to @ircmaxell !!!!