Fixed bug found in staging, commiting to develop branch