Fixed bug with staging setting