Bugs on develop

resolved bug