Bug fixed reported from manasi