Fix-499

[championpaddler]

Fixes #499

Checklist

• [x] I have read the Contribution & Best practices Guide and my PR follows them.
• [x] My branch is up-to-date with the Upstream master branch.
• [x] The unit tests pass locally with my changes
• [x] I have added tests that prove my fix is effective or that my feature works
• [x] I have added necessary documentation (if appropriate)
• [x] All the functions created/modified in this PR contain relevant docstrings.

Short description of what this resolves:

Fix-499

[championpaddler]

@hkedia321 Please review.

[championpaddler]

@gabru-md @DNS-404 Please review.

[fragm3]

Duplicate of #455, Do not create duplicate issues @sk9331657, even after reviewing that same PR