Bug fix identified by marvin test.
List VM marvin test fix.