Fixed a bug in develop branch