Bugs fixed

new version