Aravind | #292 | Fixing defects on 47