Minor patch that addresses the bugs reported here on the Hub https://www.patreon.com/posts/vam-1-20-77-3-46867154
