1551 | Subhas | Fix bug