Fixed staging bug 001 in develop branch