last version
bug fixed