From 7f60947cf829744ee20efb4adf7137ea4eb86541 Mon Sep 17 00:00:00 2001
From: Abhijith Nagaraja <abhijith7@gmail.com>
Date: Fri, 5 Feb 2021 12:53:03 -0800
Subject: [PATCH] Fixes Issues #186 and #200

This is an inspiration from the fix that @Enase provided long back and not merged.
Tested in my local setup and works.

Fixes issue #186 and #200