|#891,892|+Anshul | Fixing nasty Bugs 892 and 891