Fix MV crash