Bug Fixes.

Credits: Shipra Gupta