Fixed bug in staging branch in develop