Fix for #1270

Signed-off-by: Siddhartha Gupta <makerzzz.zzzz@gmail.com>
Merge pull request #1273 from siddhartha-gupta/Fixes

Fix for #1270