Rohan, Arathy | #2353 | Fixed the bug