Anshul - Fixed another issue with #866