#2 totaly fixed

#2 fixed