Fixed bug 2 found in staging.Committing to develop branch