Fixed bug in develop branch