Fixed bug found in staging