fixed bugs in develop branch