Fixed Rajat's bug