Fix for #1268

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

Fix for #1268